Use PushFilePreparer in apex-rollback-tests Calling remountSystemWritable to install test files on the system partition leaves the device in a state that could adversely effect subsequent tests run on the device. Switch to the more standard PushFilePreparer to set up the device rather than have to duplicate logic to restore the device to a good state after running the test. Bug: 140014856 Test: atest apex_rollback_tests Change-Id: I5d320d519d304485295613e297fc21cf470f0cba
diff --git a/tests/apex-rollback-tests.xml b/tests/apex-rollback-tests.xml index 5887448..211176a 100644 --- a/tests/apex-rollback-tests.xml +++ b/tests/apex-rollback-tests.xml
@@ -17,6 +17,12 @@ <option name="test-suite-tag" value="apex_rollback_tests" /> <option name="test-suite-tag" value="apct" /> <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/> + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> + <option name="cleanup" value="true" /> + <option name="remount-system" value="true" /> + <option name="push" value="trigger_watchdog.rc->/system/etc/init/trigger_watchdog.rc" /> + <option name="push" value="trigger_watchdog.sh->/system/bin/trigger_watchdog.sh" /> + </target_preparer> <test class="com.android.tradefed.testtype.HostTest" > <option name="jar" value="apex_rollback_tests.jar" /> </test>
